<!DOCTYPE html>
<html lang="en">
<head>
    <meta charset="UTF-8">
    <meta name="viewport" content="width=device-width, initial-scale=1.0">
    <meta http-equiv="X-UA-Compatible" content="ie=edge">
    <title>Document</title>
</head>
<body>
    <div>liaobaofeng</div>
    <div>我苏联开始大幅加快零点JFK十六分就是看看</div>
<<<<<<< HEAD
    <div>已经完成了</div>

    <div>分支的合并</div>
=======
    <div>我的妈呀</div>
>>>>>>> master
</body>
</html>